Merge "Snap for 7980267 from 6320947b8c78c120a279b49a1f2da722d7256e88 to android12-tests-release" into android12-tests-release