Merge "Snap for 7906468 from 6e64d8ab6b077b50ce6faafd68a5f284cec05a5c to android12-tests-release" into android12-tests-release