Merge "Snap for 5986292 from 39dc60d2ecef7e261bb08c90c71f985f132872c6 to android10-tests-release" into android10-tests-release