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