Snap for 12397640 from f40aa8774be1484c5443e2b1a9c5145ab29fa5a5 to 24Q4-release

Change-Id: Id5f6c26ab834376163db8fbdd58ff99face003a6