Merge "Updating javadoc for DPM apis" into nyc-dev
am: ff29237e89

* commit 'ff29237e895188e99106899806613aaa01656fdd':
  Updating javadoc for DPM apis