Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev