Snap for 9979206 from 136a00cc964831c54e3d40dce88cbbac333faa9e to sdk-release

Change-Id: I0ebcc9a213158e3b04f2918e30b496d83a90bd92