Merge "Snap for 6421561 from d3981c8028c48b6c3f947f97e17b706d548894c3 to android10-tests-release" into android10-tests-release