Merge "Make LinkPropertiesTest backwards compatible"