WaE: -Werror=unused-but-set-variable

Change-Id: I885ff40b554774d47fbbda89e4ddaaa0ca2fda4d