Merge "Snap for 9174448 from ec96c49b6089a852b37f5c6a8a50ff0dee3f5f24 to android10-tests-release" into android10-tests-release