Merge "Switch test to TestIoUtils from IoUtils" am: 709cb7ca9f am: 527de9ca59
am: 1357c5a524

Change-Id: I954162637f5d6967bcda1913b67c4bd996e7ff16