Snap for 10929834 from e34352811924755c1a2fc8b501ec0ae1481571f8 to sdk-release

Change-Id: Ia9a656041ed6f2a7a8e234a2407b899180dd7084