Merge "Snap for 7803230 from 01b6840a6aa6b8df0e416cfd838e742c5afc0965 to android10-tests-release" into android10-tests-release