Merge "BQ: Avoid unnecessary calls to consumer listener" into nyc-dev am: 72b5975
am: 327f4ca

* commit '327f4ca952bf50b0ad1c89997a83f66e04672a9a':
  BQ: Avoid unnecessary calls to consumer listener

Change-Id: Ia8335e90cac00c974e5628a47bd9929f9e632d8d