Remove unused var

Change-Id: Ib2b05704abf08fb37825b91134301e7ee4720f4c
Merge "Remove unused var"