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

Change-Id: I020944f7847badb7e65e62861837aa837733c0a9