Snap for 4710485 from d4a95a168974bf4052f63b9925de9594be684d66 to pi-release

Change-Id: I240679b58fa328769ae8e0240bcf53676a489ade
tree: 0178ae75d6a75a12c9dd4238b14db8facd869b2f
  1. core/
  2. services/
  3. tests/