[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 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 beb34da4 is in history
Change-Id: I9b0525df547a8f79b739df90f39c2aad412de2c2