Snap for 11541002 from 872099a075293e69f8673d695362f0446008fe79 to sdk-release

Change-Id: Ifaede0822e15488d211e28f6247da3b271077775