Snap for 4722539 from 52842feb146cac0ee72d866b16a1ce8e3d8b5fdf to pi-release

Change-Id: I946c5a19ade86c63ecf2c5c545bd8a754b5cc552
tree: 9b6a5e7f4249e836d3ff8a88c373387c04e43d19
  1. core/
  2. services/
  3. tests/