Snap for 11541002 from 2e27e0e7ad6c536b71bbe803d30264f12ad55119 to sdk-release

Change-Id: Ifaf715b1eb22a5bb58a4c6d3469200eb32c8f114