Merge "init shouldn't call DumpState by default."