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