Merge "Snap for 9944776 from a993a282777ab9508b371c06cc59398bc78d42be to android11-tests-release" into android11-tests-release