Snap for 11386701 from 380d8089661e60b31a9f6fbb62551e94ee9446eb to 24Q2-release

Change-Id: I7820f8a2ab872054c210201c058c20680f266813