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

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