Merge "Improve javadocs of some DPM APIs" into pi-dev