Merge "Merge "Make testing jobs easier." into rvc-dev am: f70ecc9d am: 669969e9" into rvc-d1-dev-plus-aosp