Snap for 11541002 from 84c51004aa5d80f77a6f175fbcf18872aff3480f to sdk-release

Change-Id: I6dc171aea2a072a8cb951dfc039385d06cdc6f87