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

Change-Id: I8617b69a1d79b6aee79b44fe4be4f660cdf2a427