Merge "Change to device-tests" into rvc-dev am: 855ae008ba am: c570258e62 am: 7ad287b961 am: 2070f0e372

Change-Id: Iebd0e29b2024733a6f5d0f917821b1ffed199389