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

Change-Id: Ie452fae1c71a8c7be36b87bc6d6010e476f9205c