Merge "Replace enforce permission checks in DPMS"