am 7ff38cfd: am 7488dcff: merge in klp-release (no-op)

* commit '7ff38cfd0993fa27b1e1563cf55ea0a94a609a0f':
tree: 61c38b7f1d7fa9c2858b35f99b664be50017d917
  1. res-common/
  2. src/
  3. tests/