Snap for 11541002 from 736998bce47966238ce0f93fbabb9126d1b8780f to sdk-release

Change-Id: Icee556e968322df33ce7cf071fcd8c4e92d4ea73