Snap for 11541002 from 01cca29832d553c295154e3d5966d1af86d4b41d to sdk-release

Change-Id: I67cb0d8b0d118cef08a9a5c9ec5d380a3d9c6356