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

Change-Id: I212537d25c70b3e2c4f895bba2957584f44ea075