Merge "Snap for 5930303 from 74a143d7bde98564652fbac3ffd60437c818f078 to android10-tests-release" into android10-tests-release