Remove unused vars

Change-Id: I276dfdbc08c32df9738b604f0dd2ef57b0ca58b8
Merge "Remove unused vars"