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

Change-Id: If71dfadbb8c184971bc13e4e0b966a1ddbaf8160