Snap for 11541002 from 797bf3567d01d133ca7a0703ecbec1cfeb40bf23 to sdk-release

Change-Id: Iac52dda6979bc527d7ba1cf34c11abefc910a840