am 025b1edc: am f226bc60: Merge "Use LinkAddress in address notifications." am: ff6daa9aff

Original change: undetermined

Change-Id: I6ce4bd2c4d19c29cf84f3e4a6261fc8583d04ebe