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

Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3