Merge "Patch incoming LinkProperties before it's visible to the outside" am: 7b625191e2
am: 2a4b62dd12

Change-Id: I69700df358f8c5481d03b051163ba020e83c9fe4