Merge "fix early launch of services before car service launch"