Merge "Used LinkAddress insteaad of InterfaceAddress" am: 277c7d248c am: bd681cab22
am: 25993fc579  -s ours

Change-Id: I3dfed09e54d3484096101d4eee141fcd4b91c905