am b57d3f00: Merge "Add suffix parameter to DumpCFG"

* commit 'b57d3f00ce628348ac1499824d37c98d13865866':
  Add suffix parameter to DumpCFG