Snap for 4716599 from 08d79be6bdd098a1adef6c3f707a4b8169f3ada2 to pi-release

Change-Id: I0a608654cdf67f3a56d0b8894f5458d212cb59d7
tree: 97d0333e4aed6b76ca1521e60bd0215312caea10
  1. core/
  2. services/
  3. tests/