Snap for 11541002 from af68bf99ca6c35f44c4ec225f7c5d37a20e2873b to sdk-release

Change-Id: I8d73b9d2747409e6445f09af7b6afb0a980a72f5