Snap for 12361654 from 79c604441c75ce40846cc53b28b6f55100951a5f to 24Q4-release

Change-Id: I042fce0920f5eacd62f85b867c8e44d59b3716a3