Merge "Snap for 7877250 from 0417872bf7f970998d90b11c3dcee71876532a7f to android12-tests-release" into android12-tests-release