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

Change-Id: Ic82526773116db3b80449cb0241a1f80934b3d55