Merge "Snap for 6156961 from a13af898bd38e61fc991ae8b18d8db085cd7b7ae to android10-tests-release" into android10-tests-release