Snap for 11541002 from 4029d6e45cb3ed68e3141332f91ce6ea561c0e1d to sdk-release

Change-Id: Ie4dfa6e39c7e361960780d9842da781cce030ec3