Merge "Snap for 8606237 from 46871c040ddc95ebad8b5ee53ff7518b49598e79 to android12-tests-release" into android12-tests-release