Snap for 12199818 from 4ca9590764e9bd1377dd1fd0d075348a11a529dc to sdk-release

Change-Id: I157c80a112f7adb27f87beb4c7196c86d919753f