Remove unused local variable and use correct variables.

Change-Id: I510e1734f4f6624116520d006d8f8d1ef3d22f08