Snap for 11541002 from 608e00cb6fb903b02fd0af903766fe7954affbe4 to sdk-release

Change-Id: I4be07c35e2298a07eb785a87850db38189ff0f52