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

Change-Id: I2bbee3b22b1c23f113e84ef9e87ca6082ca0b8dc