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

Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84