[automerger skipped] Merge "Hold onto linked binder." am: b693081b7a -s ours
am: f12cba930c -s ours
am skip reason: change_id I273f77aac2b80ba9be70197cc3842f83a11bbd1c with SHA1 2f34814d1b is in history

Change-Id: Ie0612ba479e28013b0961e61e33760732c92b1fe