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

Change-Id: Idb30773a7862c8bce6b24e51964d72e7e84ce122