Snap for 11541002 from 266c10dae8521a0c1e9d73b013cd34ab95074643 to sdk-release

Change-Id: I16cd5099c175c9fff4896be57d857caddada4902