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

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