Revert "Revert changes to binder and LMK"

This reverts commit 2260f51872bf6a718a7b4182ef400b4306ad3b02.