Merge "Replace enforceXXX methods (managed profile)"