Werror, Wunused-variable

Change-Id: I050afafdd9b1dad74876402665b5159a48d9f5d0