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

Change-Id: Ic8bfb02db91189a5054b36f18fb03d83fed97d5e