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

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