Snap for 9979206 from 2114a5cf0e82708cff6885a24be1995903c94738 to sdk-release

Change-Id: If89a26625d6adb5522b5dd4755255fa46ee49a98