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

Change-Id: Idebb0fc4279a059bddecffc563bdf3ddf394002c