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

Change-Id: I9af2af0357aedc6dbd2b0073b659ed619546d2b4