Merge "Snap for 5927222 from e920346cf29056acff0d98eaca91e6710cdf6ad4 to android10-tests-release" into android10-tests-release