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

Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am: b4eac742 am: dc5d0f46  -s ours am: 12a01ba5  -s ours am: 6fdc3720 am: fdd9851b  -s ours am: e98a9a91 am: c240884d am: 1899ffd6 am: d53600cc  -s ours am: fac5847d
am: e851720c  -s ours

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