This is needed for our continuous integration. Bug: T117993 Change-Id: I0e2b9b016a3680b56ec01d3b2ee8554bba1bc599