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

Change-Id: Iab7095b1cfe66c40281f9f4b4d0296b76ff5b711