Merge "Add more tests to KernelCpuThreadReaderDiffTest"