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

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