Merge "Fix reference commits in UidRoutingTest."
am: ad6a1aa20a

Change-Id: Ic353c95cca51f1a60230699b26c7b6dca5bb2a8a
tree: 66460ce83930fde33b8ee2412892c59fb6e55f8c
  1. net/