Merge "Snap for 7056094 from 13d969f56084f30fd1839c4d1f5b90141b9e2ed4 to android10-tests-release" into android10-tests-release