Merge changes I4c26aea7,I79911434 into pi-dev
am: 095b9e8e1c  -s ours

Change-Id: I19626bf87d31c759939c6aafc42ae679f6cb18e4
tree: 9142655f86aabda873ae9947798c7d1b9b6c419f
  1. core/
  2. services/
  3. tests/