Merge "Snap for 8638448 from 4a6ca4692f43749e96525c2e71f1eeb171438dc4 to android10-tests-release" into android10-tests-release