Remove unused local variables

Change-Id: If708a112ae6df070da19f52682f0e2b19fe67959
Update comments and satisfy analyzer

Change-Id: I7d8ddaa61ca8a521a98fc10237df27a11a5bbe85
Merge changes I7d8ddaa6,If708a112

* changes:
  Update comments and satisfy analyzer
  Remove unused local variables