Snap for 6489494 from 73817bc8997d03370d42be20dbb095cf3759d9d5 to mainline-release

Change-Id: I04ac11c5af37d8f50972dde8bbf99ac173964fc2
tree: d253f0fa066ebc43f8c4b2272772753f5a1d01d1
  1. core/
  2. services/
  3. tests/