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

Change-Id: I1efeb33f514663bbb102a90e786149c620435892