Merge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2
am: 082234f4aa

Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb