[automerger skipped] Merge "Added extra fields in LinkAddress" am: b3a6e91f...
[automerger skipped] Merge "Added extra fields in LinkAddress" am: b3a6e91f am: b8f708b0 am: 7d4a8df0 -s ours
am skip reason: Change-Id Ie02f91f6ac38bda99ca1bddf62d1efeeb6002bb0 with SHA-1 735e86a4 is in history
Change-Id: I685d08e24888954eba4eb869913465082ed4ee32