Snap for 11541002 from 84f0cded872ea3444ad5e5179e80bcc0c97c0841 to sdk-release

Change-Id: Id6d9278d358eb14ad05dc2802227d9645ada87bd