[automerger skipped] Merge "Set owner and administrator UIDs for test...
[automerger skipped] Merge "Set owner and administrator UIDs for test networks." into rvc-dev am: 3fdb1831 -s ours am: 2dccdc18 -s ours
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 0d8d6acd is in history
Change-Id: Ibdd6d03a7e98bcc30be1832321a3cfe434cd1082