Merge "Add more tests in LinkPropertiesTests.java" am: 6ca95d7e am: f35465e7 am: 088863e3 am: 5c66e37b Change-Id: I60ca1484a661eb1ab2f0ed9dfe76f57b18423325