Snap for 9979206 from 11e0f16dece2ddcff2964697b3366b399dc3abe8 to sdk-release

Change-Id: Iffa26c827bfb2429a02e8fa01c830de23cbec469