Merge "Properly expect all callbacks in testStackedLinkProperties."
am: a1b2a93273

Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e