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

Change-Id: I7ceb5caa7410d9fe8f820f925f0e48e393beee2d