Merge "Snap for 12359238 from 8471c36c9104af018ea901c1895dff0f857732cb to android15-tests-release" into android15-tests-release