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

Change-Id: I72b0ca1b9b50dacb7067eb6ca12ca48a072b5d26