Snap for 11541002 from eafeaa6f7ce4db90335732252973383c79e5dd78 to sdk-release

Change-Id: I9481834a58b80e6c7fcf578be49795e61ed88a14