Snap for 11541002 from 01df6281ef679fef9e58b0205d89a4d037771a4b to sdk-release

Change-Id: Ie0516887ddbeaad591ba8c830c9f573ecb216849