Snap for 6408566 from c69d7817ccbd692cb7e18639cedddacaa70d3bc3 to mainline-release

Change-Id: I2e798b7bba6ff31b4f2aa5e22fce0dc11515c822
tree: 1a709ca0cb5c30beb20224200b56e058dd7fcf64
  1. core/
  2. services/
  3. tests/