Merge "Snap for 9009571 from 220d4aba055ab8b37c3c28887d56b7d0a3ea5440 to android13-tests-release" into android13-tests-release