Merge "Enforce device policy in credential manager (framework)"