Merge "Revert "Replace enforceXXX methods (managed profile)""