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