Merge "Make LinkPropertiesTest compatible with Q"