Merge "More meaningful errors for DPM calls by non-owners"