DO NOT MERGE Create a single provider of car service
am: e0e71bcabb

Change-Id: Ie13dac4c3df795bc0a20acc8b765a7c60fcb8d3e