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

Change-Id: I88d21a497a74c69ebcb21d370e27ba74c59f116d