am 02b62df7: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev

* commit '02b62df7119b27c89d91d96938d8f4f5232b296b':
  Make sure do disconnect from a BQ when its client dies.