Merge "Snap for 9491998 from b02bdb209055b85ab3c85b0a485f683e9efc10f5 to android13-tests-release" into android13-tests-release