Snap for 4739962 from d5a1bb621a05d414ed630643898f98081893f71b to pi-release

Change-Id: I1f6271a48eebc519d5ee2bcbc23761954fe3af98
tree: 1f48bf5fd2aaf003fa0941481a4a0af54ee6330a
  1. core/
  2. services/
  3. tests/