Snap for 11541002 from 30f66a831933c8184b62fe22dec8194f5c103d71 to sdk-release

Change-Id: I0f80c240f5f711844e2a6301124e8aa3bf64034d