CodeReviewCommit: Fix javadoc warning

Change-Id: I7493a6dd403484f73a0bc305b3d24aea5184fa49
Organize imports in Eclipse

Change-Id: I32ba660c5cf0f091cded8719207fb44630bc0c6b