Merge "Snap for 12359238 from 820725a0c77a72414493d4149b775664e197d1d8 to android15-tests-release" into android15-tests-release