Merge "DO NOT MERGE Create a single provider of car service" into qt-qpr1-dev
am: 8c7181ab91

Change-Id: Ief1afee6b133063e924389c7d43521eb0f6ba1fc