WaE: -Werror=unused-variable

Change-Id: I910c2262f031f7916fbf242f31c193d8b030468b