Merge "DPMS: Simplify password sufficiency check on parent"