Merge "Snap for 6759845 from da84e29fdf39025e950663a537b750fcc8e95e62 to android10-tests-release" into android10-tests-release