Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 1f041d1443
am: 9420c284b5

Change-Id: I171e667dd279e008708fbc84972f63cbd5b55625