Merge "servicemanager: hard failure for missing context"