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

Change-Id: I75e95c8f3479e41d731e5adb2e4119ab457bfc00