Merge "Change default dump format to JSON"
am: 963b9c59b3

Change-Id: I234dc350277ba4d5f3dde06234781ba8aa695ac3