Snap for 4698807 from b2e6e45d009e7c9148e69bf2c1f0b46917bee7b0 to pi-release

Change-Id: Ie992f5deec4eb1cb35cd1541dac5445a42039394
tree: 5c107ba8f3dcbe4e9daffab924823992eb6df19c
  1. core/
  2. services/
  3. tests/