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

Change-Id: I292d7aef8e337bf850d590a385e1bdd4c0c344b9