Merge "Revert "Revert "Use Apex sepolicy if it's available"""