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