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