Merge "Make testing jobs easier." into rvc-dev am: f70ecc9d am: 669969e9 am: 74f71e38 am: a352cf38 am: 49096723 Change-Id: I39fc50dd42a70ae63b801594df898c5c052a5408