Merge "Hold onto linked binder." am: 5e343ea8db am: 6915a76f1d
am: 6b40b59d99

Change-Id: I5d8b1097991fd7d94d617933904f08e8e745b6b1