Snap for 12385180 from bb9370b2203485e98817d700624c923e79f3d008 to 24Q4-release

Change-Id: I1dbbe83b1721b51662e4adf40274d8621dcdbe3b