-Werror,-Wunused-variable

Change-Id: Id3e24e7efd84db03d0d1636bf099bac3fede55db
-Werror,-Wunused-variable

Change-Id: Ia202059eb891b1088dc276c963e16ede93fe8d05