Merge "Change to device-tests" into rvc-dev am: 855ae008ba am: c570258e62 am: 7ad287b961

Change-Id: Ic6a76ad24e4cbe537f77b09c5ea0173d16cb0cb1