Merge "Tighten test for warm sim and add more debug." into klp-dev
tree: abe16949abdc3e2ff951eaab8d0fb3d1bb5fac1f
  1. core/
  2. services/