Snap for 6539570 from b04b04a849eac3c27464bc76d16909fad37bedf5 to mainline-release

Change-Id: I03a57a5f17ac6753aba6153ceb0548dd31d017c7
tree: 143fa9ba6a4091a3ec03ec095cf2c37ec8e7898b
  1. core/
  2. services/
  3. tests/