Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
tree: 3bf356b8e373af31429aa1e65f0255dd36a3376a
  1. core/
  2. services/
  3. tests/