Snap for 11871564 from 830536aa89cc5d0a9e8804ae862911018d3824b8 to sdk-release

Change-Id: Iada4b13c934474e41f032ccb178bf22ebcb77609