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

Change-Id: I539a753af27425c7ec851c3ee55f117810484222