Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am: b4eac74 am: dc5d0f4  -s ours
am: 12a01ba  -s ours

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