Merge "Remove unused network management RPCs"
am: 53a122986d

Change-Id: I6c8c0aac1d362672579654ab2ad12045c91d66f2