Merge "Remove unused imports from Main.java" am: 8fe2c34a0d am: 04a8893896

Change-Id: I898d5a6d24b0f73e18c8c95cf5b32c30ea0bcad9