Merge changes Ifc561b6d,I63137b24

* changes:
  Remove RouteInfo hidden depdendency in NMS
  Remove the hidden ConnectivityManager dependency in NMS