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

Change-Id: Ie55b0d948f11615d386e5a35e72eeb08f1e34798