Snap for 4723085 from a7579d632590457cb987f0199550ab4e25fb504d to pi-release

Change-Id: If7b1c24a6f0c5a5a2a512197131a3612a42f3e72
tree: 0885dd218b1f75883164dfa39e42d58cf098b489
  1. core/
  2. services/
  3. tests/