[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 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 f04e028d is in history
Change-Id: I2790f87a2211ae084cd11f373e94aac3e1eba291