am 18c1d830: Fix build.

* commit '18c1d8301d8f544ae133198459bbf2698d80a14b':
  Fix build.
tree: 13318bb4aa0d117dcab28166ec830d2922c36c83
  1. core/
  2. services/
  3. tests/