Merge "Set owner and administrator UIDs for test networks." am: eb44b7b1bb

Change-Id: I3b1c29b30912c4dddc3524a9a28fb3ad8c3ac318
tree: 30bf8438eb2a804c37d8f3d05194e7dcb7f2f9b2
  1. core/
  2. services/
  3. tests/