Merge "Remove some usages of IoUtil methods"
am: 64c393fe30

Change-Id: I402fc7196adee1ea1a6ee6aeddf7c615579b19ea