Merge changes from topic "ka05"
am: 455df13823

Change-Id: I2448348d1501ca50daac87f4c06c120b4de3b2ae
tree: 5c91e65776c8953176bd4c342f2592f106a6e79b
  1. core/
  2. services/
  3. tests/