Merge "Add support for registering test networks with administrators." am: 84091b4c am: f1cb6c71 am: ac1663a7 Change-Id: I95ecd74a8c2462e00deb84a43260bcbe3d189a09