Snap for 11541002 from 79d50c71070ca6b45202dfec73d0da6beb774d05 to sdk-release

Change-Id: Ice017fc15fc37e52955149254e242e8206b3fd59