Snap for 11380007 from f36182d51379be6de1af1e26508ffccb4fe51ece to 24Q2-release

Change-Id: Ifdec9aef0248820050f6c75875c8007fb4fe9822