Merge "Add UID for vehicle network" am: 9112b419bd
am: 3142267ff2

Change-Id: Ia7fbc5f1c6db4bef85451988866ed5dc7e289232