Snap for 11541002 from e352aabd0131f3ac3f340282a43ba85ffc3fe8fa to sdk-release

Change-Id: I609df9d1067b0194d13b65f08b9882df6426dc49