Update CP2 javadoc
am: 93d94ebac2

Change-Id: I2b1cddae5407257aaad84f4b9dd492fe69ae5d27