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

Change-Id: I0c2270f87deef490e76bb4b7303abfda8c68d71d