Merge "Change to device-tests" into rvc-dev am: 855ae008ba am: 46a8740d09 am: 7cd17a687a am: 565d34c177

Change-Id: If37b1c00aadd571f80795eb338a160679810c495