Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am: b4eac74 am: dc5d0f4  -s ours am: 12a01ba  -s ours
am: 6fdc372

* commit '6fdc37205c32dcbd23718d68e45806c76f1536f8':
  DO NOT MERGE BQ: fix some uninitialized variables