am fe648b4b: am ead79b83: Merge "Binder: Make sure binder objects do not overlap"

* commit 'fe648b4bf346f837a6ff554ab44fedb203b86966':
  Binder: Make sure binder objects do not overlap