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

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