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

Change-Id: Ic13aab521854644043c09c24181a26b96e08538a