Snap for 11211409 from d7705cbad0c7c36730a2babb57ceb56cde151bfb to sdk-release

Change-Id: I191b821b0e7bae388b8f22fdda016c3e0f73058b