Merge "Revert "enabling apex mock-detached deploy state""