Merge "Snap for 9191496 from f86522c2da33da11ab74135a0e895832e5bfd75b to android10-tests-release" into android10-tests-release