[automerger skipped] Split vehicle client and server interface header am:...
[automerger skipped] Split vehicle client and server interface header am: 2f2b3bbe am: af57a4d6 am: ea6cdb8e am: b82291f6 -s ours
am skip reason: Change-Id I550034b071ca6a7ca322fb26b61d76ed4a7307ee with SHA-1 2f2b3bbe is in history
Change-Id: I1ed11150c74cd34f25f79dfe62b9e0fce90ff5fb