Merge "Add missing JavaDoc and remove unused imports" into nyc-mr1-dev