Merge "Fixes some DPM APIs to use the context user."