am 699a32bc: Merge "Refactor ConsumerBase and it\'s derived classes." into mnc-dev

* commit '699a32bcdfaf0390a269a275b979d46ca815654a':
  Refactor ConsumerBase and it's derived classes.