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

Change-Id: I351a598dc2f62ff7419daa6d0f7b4e4cc32d15f4