[automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into...
[automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 8e6f66bd -s ours am: affe6c11 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 f04e028d is in history
Change-Id: If7f339219052efb617eeaf9f878b01fac5394859