WaE: -Werror=unused-variable

Change-Id: I857fcd923788f086294f8f3e3105b44949d80e56