Merge "Fix NullPointerException happens in dumpCheckin"