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

Change-Id: I18b5e389b35b3d4756dc8ab9094349310eeccf14