Merge "Fix some problems with proc stats collection."