Merge "Snap for 7063551 from 3d7e667b0a2cac92d4b2acb9284cbb7b5813832c to android10-tests-release" into android10-tests-release