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