Merge "DPMS: Fix access control check for password sufficiency"