Snap for 9979206 from cfe03e6e1f706019093cdc099c4bb2ee2d1b5a60 to sdk-release

Change-Id: I6bb6d0e14f7a3f9c66ee5a1f71cc9e689f65308a