Merge "Snap for 6482848 from ebeff98bbb9a2dca3b196a542468cbd61390e7a1 to android10-tests-release" into android10-tests-release