Snap for 6660490 from f66ff27d7fff545d48dd2d584d9e8bee5f3bfa25 to sdk-release

Change-Id: I5acb158963d9c9563de5a6b723d0d1523e39b012