Snap for 11541002 from de0ba12639dc1a10a5e339d20e9845afd28d6157 to sdk-release

Change-Id: I86ab49c8a11b1280f11972dbec6bac39435b6f84