Merge "Snap for 10011508 from b880578664c9d486b2bae51e540c8e6ff2af8017 to android12-tests-release" into android12-tests-release