Snap for 10897809 from c925e13a31ff7fd475ab74cbf38bc6dafb26a5f9 to 24Q1-release

Change-Id: Ic8db83d4b878e529159c203e3f176b96a9c1b99e