Merge changes I1aab1dbc,I83c92971,I47337efd into jb-mr2-dev

* changes:
  Revert "Add new sensor types."
  Revert "Remove spurious @Override."
  Revert "Add a minimum size for the event pools."