Merge "Add cleanup upon disconnect of CarService"