Merge "Revert "Add a callback thread to ConsumerBase"" into nyc-dev
am: 49380be2cf

* commit '49380be2cfbc43adb79ef559b7bd8578040948cc':
  Revert "Add a callback thread to ConsumerBase"