am d2c4a206: Merge "Fix incorrect comparator implementation leading to IllegalArgumentException." into cw-e-dev

* commit 'd2c4a206cbda822a1c1f575fa29975565e4a8ea3':
  Fix incorrect comparator implementation leading to IllegalArgumentException.
tree: b71c3127f196c8d6e5931733ad34b10702c5e79a
  1. service/