Merge "Add UID for vehicle network"