Snap for 11541002 from 8f91cbfd72b384a788fe6cca6c7dfd141202258c to sdk-release

Change-Id: I1f92dba888bb982bfa0e4277ab724f2d41a0bceb