Merge "[automerger skipped] Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev am: b8b53564 -s ours am: 10e2a053 -s ours am: a67ca01b -s ours" into rvc-qpr-dev-plus-aosp am: ec4ca2cd -s ours

am skip reason: Change-Id I570efa4eb483a717d4204a18473d02653a69f46d with SHA-1 1f074882 is in history

Change-Id: I758533e56de5d4c41e0a2cf5a1534ea430d0dede