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

Change-Id: I3b1c29b30912c4dddc3524a9a28fb3ad8c3ac318