[automerger skipped] DO NOT MERGE Create a single provider of car service am: e0e71bcabb
am: b2760dd3af -s ours
am skip reason: subject contains skip directive

Change-Id: I4d80a0ce727cd7c4b3d06351347b657969c4afdf