Merge "Remove IoUtils from intra-core API" am: 2df2ca9a34 am: 6279f7b152
am: aa1272acaa

Change-Id: I32ce6dda04be4df1815c59ec8a2112209db21bed