Merge \"Dumpstate: Fix long lines.\" into stage-aosp-master
am: fde0beac8f

Change-Id: Ie5230f962c39bb2134d2347ab848a12c498a7ce0