Merge "Snap for 10255177 from 0412ff9c1e3e10677db888ab3b4f5a964ff83613 to android13-tests-release" into android13-tests-release