Merge "Add more assertions to testStackedLinkProperties." into rvc-dev am: 78c79bec07

Change-Id: If6050e414cefcb94be3d473e25cae7e1c996d3cf