Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1

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