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

Change-Id: Ibd5c615b9cb38664742e96327163bd970a38d848