Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev am: f531f886 am: 42a0e89b Change-Id: I4ab30e194dca28decc9e621c45d25af3d4c8b2c8