Sio Updates

Change-Id: I08b96c0471f59c1942a9a14fc2e9019c2d4cae6e