Snap for 11541002 from 38b979bd02ade8781b7de0bbbb7a37fb3cdca72b to sdk-release

Change-Id: I4e85d1243c419163ea3c0d32596940762878ee2a