Merge "Fix dump formatting." into pi-dev
am: da224ff2cf

Change-Id: I9ccba1ac5a1b8aa13d4ead52988a6aed1a3bb042