Merge "BQ: Fix segfault in dump()" into nyc-dev
am: ed2c5d1931

* commit 'ed2c5d1931bb48240b9293b0d0c3d370fbbd6f81':
  BQ: Fix segfault in dump()

Change-Id: If9d49120eca9624c99e1bfbcdbd55052698a8633