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

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