Reconcile with klp-release - do not merge

Change-Id: I11d427fe49ec6cb012b0176734dc245eabd5f50b
tree: 6b413911333186f92c30ac31bf198d11ce951d9f
  1. core/
  2. services/