Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev am: 322df2899b  -s ours
am: 757b467b82  -s ours

Change-Id: I3db147e56ae38147926f34307672b32c31737e78