Merge "Prevent a 4-way binder interlock leading to a leak." am: 2b801dc0 am: 88cf9c53 am: 6010104f am: 7588a056 Change-Id: I6b74cf12bdbc72c0593d2a4d6f39c895d1ef3534