Snap for 4693955 from d197642ba89e2e47837cac1fac964e3e16a4b88c to pi-release

Change-Id: I6e6f83688e11a4b7b20c32e170e39c5f7abbcadb
tree: 3e75016e97b41a0a1c3d69627481d0775170b1a3
  1. core/
  2. services/
  3. tests/