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