Merge "Snap for 7842685 from 53542c3757bc5b71677c42a4a777c64ee7a12704 to android12-tests-release" into android12-tests-release