Merge "DPM API review: Remove "ForUser" method"