Update JavaDoc, code formatting and imports

Change-Id: I83eaf419cb5fb4bed76463ed4325c0131ef457c3