Merge "Snap for 5934577 from 14468059ee2a0f3214c1e069c174a090abc6dcae to android10-tests-release" into android10-tests-release