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

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