Merge "BQ: Fix iterator use" into nyc-dev
am: 5d9d711a16

* commit '5d9d711a16d7560f4be62cad2413dbcb5feddfde':
  BQ: Fix iterator use