Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: f9d61f1c6d
am: 96f34c3151

Change-Id: I171e667dd279e008708fbc84972f63cbd5b55625