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

Change-Id: Ibfc1be2e66b68bd001f1bd276abc3a78a062fb00