Snap for 6417465 from ad89080ba2dd7bf789abb8e538a2ac6c8b5adec2 to mainline-release

Change-Id: Ie94a81b8cea99a2f626daa5598d92a998de3399d
tree: 7f09fe1011a9bd28cfcdef93f1571817171dcbd9
  1. core/
  2. services/
  3. tests/