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

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