Clean up local variable usage - Neutron

Change-Id: I3e19efd46cadcf0b4129a0f923fa7881f702d65c
Merge "Clean up local variable usage - Neutron"