[automerger skipped] Merge changes Iaa78a7ed,I6497b7ef into pi-dev am: 6e79d000ab -s ours am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1 caefc43336 is in history am: 9f25649d7b -s ours am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1 caefc43336 is in history am: 99e7f42615 -s ours
am skip reason: Change-Id Iaa78a7edcf23755c89d7b354edbc28d37d74d891 with SHA-1 caefc43336 is in history

Change-Id: I72c045aeeb3c516a286ad5ef6413fb227019a299
tree: d46a25e349990d67a37f11cdaadc3cbb8d957c26
  1. core/
  2. services/
  3. tests/