Merge "Revert "servicemanager: hard failure for missing context""