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

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