Merge "Snap for 6305913 from 2c8ca771e76d418d144bc45c13731b6417b8cde1 to android10-tests-release" into android10-tests-release