Snap for 12440112 from 1ce2aa5766ce218335829d4661cd73a5aa23adde to sdk-release

Change-Id: I1245c34342a3b9ab2dcfdf6d6cfe4191e3c1d523