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

Change-Id: I018d384ead3e0e585c9b0b4c83849251069c77e6