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

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