Update CP2 javadoc

Bug 30895732
Bug 30063194
Bug 30254247

Change-Id: I6af160daf06a52bd96db8f1dd1aa0c3bf3646fa1
2 files changed