Add comments, fix some java docs, delete unused imports. Reduce warnings from CodePro.

Change-Id: I104e602687940d7cbbe36d0919b427dd74b8c07a