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

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