Snap for 4826885 from a76360ddf1f709d71ac9efe55739f071ce843ca5 to pi-release

Change-Id: I38823c8a96dd5a25943a4218ae1c254a2f7feb46
tree: f67aceb1199eece217506b18dfc1077b45e065cf
  1. core/
  2. services/
  3. tests/