Merge "Snap for 7078141 from f1dc92cbd689640e882f51552abe740ee4325bc2 to android10-tests-release" into android10-tests-release