Merge "Snap for 6295063 from f29f5bd822d60bf17ea5b0878c9debd294347818 to android10-tests-release" into android10-tests-release