Snap for 6431658 from 7fce13eef456b209b4f1d489da3e2cd8eed432b5 to mainline-release

Change-Id: Iaf97a4c5198d586974b6db6e113ba7fdfb4b7884
tree: 922da46b2e42c22a798e1e73ecffe72123d7b90c
  1. core/
  2. services/
  3. tests/