Merge "Snap for 6383024 from a806fa9599f04b7f8bfffce937305043b3c86673 to android10-tests-release" into android10-tests-release