Snap for 4706961 from 4f9d750e91061923da90ef174a592fc59d0eff9e to pi-release

Change-Id: I4260634c95472eac375aa3dfc5ec4ec45426897c
tree: f24ca2318c57af7bfc5ef91fb749dad5ec634ece
  1. core/
  2. services/
  3. tests/