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

Change-Id: If55fe92af710221000ccec4e09eeba9f56c8a7aa