am e3ec7541: Merge "Make client/app ids objects in the binder API"

* commit 'e3ec7541535263d1b80ae9da09c8f82f3e6074c1':
  Make client/app ids objects in the binder API