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

Change-Id: I6987dc9c80b8d48c8354f654f21b056d2bd896c5