am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."

* commit 'ad5ed361a757494c0b308ec43cddc80ed9d8843f':
  Fix build from -Werror=maybe-uninitialized.