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

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