[automerger skipped] Merge "Add support for registering test networks with...

[automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: fffee665 am: 2d68d46e am: 827a99ff am: 2acb656f -s ours am: 3e41720b -s ours

am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 fcfddefe is in history

Change-Id: I0bff9e947998cf1e4ab017434a8e4e2414c1307c