Merge "Snap for 9163022 from 23c56a47d01f6929575c62373cfbdde6881b5836 to android12-tests-release" into android12-tests-release