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

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