Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 2971c23c97
am: c66885bc37

Change-Id: I171e667dd279e008708fbc84972f63cbd5b55625