Snap for 11902131 from 6582a634fbaac98511c42014f4b5a05b9eedad46 to 24Q3-release Change-Id: I11988172c9c70c3433d4708980816d4141deef0a