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

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