Snap for 11784291 from a3a45f308bd90ef1a6e6a5e8fb92fe449b895909 to 24Q3-release

Change-Id: Ie69c4103d53c22721292fb7d1158ac40733de68d