cleanup - dump_config() am: df61a34d3c am: e2f034d446

Original change: undetermined

Change-Id: I4a26cc1e2625fe04650de0ed1ed6b66f0b522fb8