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

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

Change-Id: Ia255fad9ae1d3f68488891b92731a46efdc0baab