Lint fixes for neutron bits.

Change-Id: Ic4195c07c9f7ad7e885d161361f01040ae25615e