Merge "Integrate missing changes from vehicle.h"