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

Change-Id: I0b6b0c92a8e516602b3a43635b57a6178530c859