Merge "Snap for 6022497 from f2748ff663798029c19082b68356c7a4224ab43f to android10-tests-release" into android10-tests-release