Merge "[automerger skipped] Merge "Add more assertions to...

Merge "[automerger skipped] Merge "Add more assertions to testStackedLinkProperties." into rvc-dev am: 78c79bec am: 0ae94031 -s ours am skip reason: Change-Id I7d111382be215a926a7d7d4701bd3c3e94372b99 with SHA-1 5e340d20 is in history" into rvc-d1-dev-plus-aosp am: 210d36cf -s ours am: 711230b4 -s ours
am skip reason: Change-Id I7d111382be215a926a7d7d4701bd3c3e94372b99 with SHA-1 7d66c267 is in history

Change-Id: Ic624df1713c7d7b1ff50c80142b8e30c5d86b2ac