Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358