Fix AS Inspection warnings
Organize imports

Change-Id: I59e545c0020a3d488917c54107e114604a749699
17 files changed