Merge "[DO NOT MERGE] Revert "Verify device is pulling assets from correct bucket"" into android12L-tests-dev