WaE: -Werror=maybe-uninitialized

Change-Id: I8f63bc51c48d69eaa81bf080b05747c026871f08