Merge "Snap for 9156787 from 61392e8f6cb4be0b213a3913e014cd27d08b5538 to android13-tests-release" into android13-tests-release