Merge "Snap for 5896244 from ad615de885457e0d5aba128522ee86656f3f9ca1 to android10-tests-release" into android10-tests-release