Add use declarations for core classes, fix style issues

Change-Id: Idede243ccfe5d55c91d051418d981dc968390f0a
Merge "Add use declarations for core classes, fix style issues"