Merge "Snap for 10661575 from 5355dd1224d3989028527f2242c4107a95e9dde8 to android13-tests-release" into android13-tests-release