Snap for 6530637 from 9de671b35b77e4bb744decb5e3024e8359c9ed62 to mainline-release

Change-Id: If4d01f670f7b4326ee951196dda390b730f84d03
tree: b8f0ca9de5df64a1fb12952685e251bf5c3ede0c
  1. core/
  2. services/
  3. tests/