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

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