Merge "Snap for 6000799 from 031f612a966255ee5a49dba640e95a407f221ab1 to android10-tests-release" into android10-tests-release