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
am: fac5847

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