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

Change-Id: I8d848c559e1c1e021a72bf525876aad9bddb3374