Merge "Update CP2 javadoc" into nyc-mr1-dev am: 82babe050a am: 2b569adeee
am: 828c24b54f

Change-Id: I951301574e3d0bbf9e36a60e7d702bde3f252cc0