Merge "Snap for 9557980 from c78cc494b2981d7865adfc9c7484296eccac52e4 to android10-tests-release" into android10-tests-release