Snap for 11541002 from f35fdf8ee1206ecffb01b7df1a9e21dfdbef772f to sdk-release

Change-Id: I3639768e4bc46f0d886f36a372074961dccb436f