Merge "Snap for 8113988 from d59857efb33e823960210e507aaeceee6c703e2c to android12-tests-release" into android12-tests-release