Merge "Snap for 7906468 from 578d21a83a80da8c78a1a7b20b3903efa9dff182 to android12-tests-release" into android12-tests-release