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

Change-Id: I9e398c6997c84ec40cf5ae4536768bc51a510c64