Merge "Fix FD comparisons in binder" am: 1a9db5066b
am: f18ddef416

Change-Id: I7a0cc9402d0a57415e5d337d9d2a407f7f09043a