Merge changes Ice19df39,I9e2e6d19

* changes:
  EnforcePermissionFix: refactor for greater separation of concern and reuse
  SimpleManualPermissionEnforcementDetector: suggest calling helper method and turn on