Snap for 4742838 from 728cb519a5c734af0b7befa52d803d9d090a20aa to pi-release

Change-Id: I41c109022b915f160a4971c66eb9fd171d64a8a8
tree: 728e2fc4bfbe39e5726d8dcfccd1e68d670364e1
  1. core/
  2. services/
  3. tests/