Update CP2 javadoc am: 93d94ebac2
am: e3972019dc

Change-Id: Ia988c68813311b042c6ba9fbaa3c486935e5566b