Snap for 11541002 from ba0ee18f61b1bb6c55431c33f584e2e4b5568ce9 to sdk-release

Change-Id: I2d3013a862b3c02a5f02e175c5d53b71f4b3d679