Merge "Switch test to TestIoUtils from IoUtils"
am: 709cb7ca9f

Change-Id: I757367421f4ec93b512fc3bd7a77869a4b9def96