Merge "Snap for 9143886 from 793d1fb5ab5e038332f7c54647bea507a094910f to android12-tests-release" into android12-tests-release