Snap for 4751833 from 8f5b3f19b4b10a55e283c48ba64261e1f33c9b0c to pi-release

Change-Id: I049ecf5ab302a6bef275210404b9119be9ceb328
tree: 9d92b09fe3cf81afe036ddfbac63862e73ffea83
  1. core/
  2. services/
  3. tests/