Remove class-based import in the code repo

Fixes bug 1167901

This commit also removes backslashes for line break.

Change-Id: Id26fdfd2af4862652d7270aec132d40662efeb96
Merge "Remove class-based import in the code repo"