Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev