apache: lint fixes

Change-Id: I1759377b24e7b8498801cfcc8a3c151a5422be58