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

* commit '72b59753f90df64b3dd86fa6a166b24c8b64b985':
  BQ: Avoid unnecessary calls to consumer listener

Change-Id: I06c0cf4383e2e3c9c0d3589b8fedc4464ca9c373