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