Merge "Add more assertions to testStackedLinkProperties." am: 78b733fa6f am: d63b7c0314

Change-Id: I4f5dc651847aae2dfc61b1f5234bab5f899feacb