Merge "binder: No further overrides of *Object funcs." am: 4fabf33599 am: f7ed9e8c29 am: b0f8a4e378
am: 785b7181cb

Change-Id: Ia81e5572e53298e4cfbaf1818c0e008cea1001a8