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

Change-Id: I973f7b68440855e2dd5d5dd21cf5594dede6aecf