[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 skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 47cf27f6 is in history
Change-Id: I378c8d86396f0a8ddb803b86ef8426b4dca1c153