Merge "Used LinkAddress insteaad of InterfaceAddress"
am: 277c7d248c

Change-Id: Ib5f7151d0738e73067e734d7943cdc5b734a1039