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