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

Change-Id: Ib14e7dbbba8f91de0491be9b91b5891ce8520c00