Merge "Exposed some testAPIs in DPM" into sc-dev