contint: linting fixes and autoload module

Change-Id: If14293939f2614bb6096f35a27df6debb036cf5c
Merge "contint: linting fixes and autoload module" into production