Snap for 9979206 from a4ad1f2637b21fed9030552136b9a1887a76a944 to sdk-release

Change-Id: Ib1bc1ba9d0b0c2e58cef61668560c1b65d9a6513