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