Merge "Snap for 6312997 from 5c124b62e31453ef7077fa45d5f44a27095ec6c8 to android10-tests-release" into android10-tests-release