Merge "Fix build from -Werror=maybe-uninitialized."