[automerger skipped] Split vehicle client and server interface header am:...
[automerger skipped] Split vehicle client and server interface header am: 2f2b3bbe am: 4e98e28f am: 6dca0538 -s ours
am skip reason: Change-Id I550034b071ca6a7ca322fb26b61d76ed4a7307ee with SHA-1 2f2b3bbe is in history
Change-Id: I17ab56ff4c3452cf6f3f50e52be331db0ad34e46