Snap for 4784261 from 037834d55772403be181cac74e8d806aa3385ddc to pi-release

Change-Id: If699bf35aa77c7c0aeca814b9c02cf155159fa69
tree: 096a33bb1a5cf9f30029b33cc9c7df11fa6b1520
  1. core/
  2. services/
  3. tests/