Merge "Make getAvailability() always return true"