Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev