Snap for 11828632 from bb379d4f8203c3e1d6112fdf3b66065e548991b4 to 24Q3-release

Change-Id: I149c512127aa62cb8d176efbf0bfc2c8c9f2c9c8