Merge "Fix unit test to check both ECM configs" into nyc-dev
tree: 338664efdd32b37a2afb1210a515aab7322f66b0
  1. service/
  2. tests/