Merge "Updating javadoc for DPM apis" into nyc-dev