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

Change-Id: I48755445c4a531b813b5c8cd40a8d7a2c3b75b2b