Merge "Revert "Fix broken unit test""
tree: d474d31d30e4a813a357612b3249d76ad9eee8c8
  1. core/
  2. services/