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

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