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

Change-Id: I032ba648ec0476ab8a02a710e2ae485ab4a590b8