Snap for 4793185 from 915e94484b73d5184ccd0e8d4f58e16b973e5b3b to pi-release

Change-Id: Ic8c5947927774388a5fbcd6923bbdbcc631610c1
tree: 8dfe1fed30ae191a127ce6d58732f594ec521330
  1. core/
  2. services/
  3. tests/