fix misc jenkins warnings in multiple modules

Change-Id: I83c8de2318f11355c1ad0c23eced02792005efe4
Merge "fix misc jenkins warnings in multiple modules" into production