Merge "Change to device-tests" into rvc-dev am: 855ae008ba am: c570258e62 am: 0f3efe649b am: 6033ccd2e6

Change-Id: Ic761692136bf3f824a6b11c10f2a2c06af825b0e