Merge "Set owner and administrator UIDs for test networks." am: 2ba1b8ecd1 am: f9877d902e

Change-Id: I7af702ff5eafbd0f5bb2247e0debf975e51accd1
tree: 3c6d4ef123e9545413941f6bc4d7ef7bfccadcc2
  1. core/
  2. services/
  3. tests/