Snap for 6393130 from bb3e9978110e7be3503e727583b802c813152ed4 to mainline-release

Change-Id: I2208ad19d62feeb20b9953215c11486a3ade7a9a
tree: f2531be77c389d625e178ca2939561462d6631e0
  1. core/
  2. services/
  3. tests/