ferm: lint fixes

Change-Id: I2f0368374f4190aa16f64c1abd26f3ede5b6ce07
Merge "ferm: lint fixes" into production