Merge "Fix broken test due to API rename"
tree: c896f6466a022f1b2889ff6365d57d2c084d2205
  1. core/
  2. services/
  3. tests/