Snap for 4683893 from f0edf03edaaf15a48295ce87baae93e1a7db0122 to pi-release

Change-Id: I8a450a70da831c3964896b1ba09467cf62f9c138
tree: 9116634a64b29a0c819e5956408a0774d4789e3a
  1. core/
  2. services/
  3. tests/