Added fixes for SAIO.

Change-Id: If0276c1df38cda7974e645d3f3cb8fb50d131e4d
Merge "Added fixes for SAIO."