Merge "Snap for 7301277 from b3a81c556152542cdac6d656f3fa3931735c1e8b to android10-tests-release" into android10-tests-release