Snap for 11406759 from ffd608a0b78e2a3fa1941d670d5fe10fe07fcd79 to 24Q2-release

Change-Id: Ic9e92f57d7ad87ac5d0ecd98466d9d0f91fda669