Merge "Updates for LogfileLoaderTest.java"