Merge "Replace FileUtils.toByteArray() with IOUtils"