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