[automerger skipped] Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev am: b8b53564 -s ours
am skip reason: Change-Id I570efa4eb483a717d4204a18473d02653a69f46d with SHA-1 dcb283d4 is in history
Change-Id: I652b0744dcd2fff34609999fff062827efe5706e