Merge changes from topic "sp04"
am: 91c7daa454

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
tree: 9aca0e4dca91372369f32bf928b3b2cce0b9c61a
  1. core/
  2. services/
  3. tests/