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

Change-Id: Ib1ab9dc28081d9e911441a3476edfc75c0b6fac6