Merge "Set owner and administrator UIDs for test networks." am: b54e6b43 am: 9f622464 am: b07eaa50 Change-Id: I0d467e1fd02995cf2fe4c3f41e0ea78d4f2be9e2