Merge "Revert "Revert "Revert "Introduce initOrder for apex-system-services.""""