Merge changes from topic "sp04" am: 429d86ae3c am: 3402bbf714 am: 75f84db7f5

Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
tree: 73c331bff40723bbe2632ef96f02f4122b11a850
  1. core/
  2. services/
  3. tests/