generic: lint clean

Change-Id: Idaf1638068fc189d8f69be641bb211a419427a34
Merge "generic: lint clean" into production