Snap for 11541002 from decacec3b56f9ca587831b65d18f5089a3c5ca48 to sdk-release

Change-Id: I17ee2b2381cbe1237d5732ac4ba26f4d99a0a4ea