Merge "Stop coalescing kernel processes to the same name, other changes." am: 400e7c238a am: 9da97f38d2
am: 172c07165d

Change-Id: I1c256f3594419af850a73e378f5a75e7d3fdaae8