[automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 52655a00d0 am: f5780f203f -s ours am: 8524babf8d -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: I5a40a74c489c782151a20f07a23177500b76e2fa
This commit is contained in: