Merge "Add a callback thread to ConsumerBase" into nyc-dev
am: d880e517a5

* commit 'd880e517a56d2a73199591bcb9531a4ffa5b53cc':
  Add a callback thread to ConsumerBase