Merge "Make LinkPropertiesTest backwards compatible" am: 9b6ddfb5b8

Change-Id: Iedcb704eba4a342058a7b6fdea3f1bd83dec4744