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

Change-Id: I15582edb6822edada30b75c3a14b521f53b05b07