am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

* commit 'eef8d3eb40f2775ca079b4e50ced8d4eafcbc7fd':
  Revert the configKey generation algorithm to what it was in K.