Merge "Snap for 7554323 from ae713a67aa68b795f9b8238298bea70c67002cc6 to android10-tests-release" into android10-tests-release