[automerger skipped] Split vehicle client and server interface header am:...
[automerger skipped] Split vehicle client and server interface header am: 2f2b3bbe am: af57a4d6 am: d8508fde am: 34568041 -s ours
am skip reason: Change-Id I550034b071ca6a7ca322fb26b61d76ed4a7307ee with SHA-1 8dfac92f is in history
Change-Id: I7a370e87b734b35e01f9683967bb2895103cf4fa