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

Change-Id: Ib86dc62e43edf12e36345937bdb5fe128408b0ad