am 675dc869: am e4f0d1c4: Merge "Fix crash in KeySet dump" into lmp-dev

* commit '675dc869bd73c526cd07e172e0e125e3a5d915f6':
  Fix crash in KeySet dump