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