am 040e68f0: Merge "Add argument to binder call to check key types" into klp-dev

* commit '040e68f02639048f76dcba2fcefbd43152697690':
  Add argument to binder call to check key types