Merge "Snap for 6218191 from 952de6e2e51e7bac3de6261f5b89011901de60b8 to android10-tests-release" into android10-tests-release