am 2e5ee000: Merge "Fix bug reporting CPU count." into jb-mr2-dev

* commit '2e5ee000dc83f9fc70aa41b1eaa41b911637c4e2':
  Fix bug reporting CPU count.