Snap for 12199818 from cdfaecce5d21cbdeeb6adc066a95e5484a4bde45 to sdk-release

Change-Id: Id043620646a3372f5a76c5ab5682918b11a07a9e