Merge "Honor service_available options"