Merge "Snap for 9874748 from 945752576027d17000749f33f821a6ec545be989 to android11-tests-release" into android11-tests-release