Merge "Make LinkPropertiesTest backwards compatible" am: 9b6ddfb5 am: 2a22fe99 am: 64c988eb am: 7935eb33 Change-Id: Ia697c8e4b78cac25036520c09223368cf7c38ff0