Merge "Add component types which a process is hosting into the proc memstats" into tm-dev