Revert "Revert changes to binder and LMK"

This reverts commit 2260f51872bf6a718a7b4182ef400b4306ad3b02.

Change-Id: I9ab0722ccc66bb7155eb5613c501e239bf61a212