Merge "Fix EmergencyAffordanceService"