-Werror=unused-variable

Change-Id: I44e4f9a38deac882acbd444b5e7026d5019ea958
(cherry picked from commit 296b1e76071698c990e726d2f7935cef9ca07fbe)