Merge "Add StackedLinkProperties test case" am: faf31f8638 am: 946957bc32
am: 05778e562c

Change-Id: I2228d19282a9871c04e2529304c4fd99bd4d01f4