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

Change-Id: I3a3eab643374ecabd5c6a191e7558ce309416984