Merge changes I3525edc3,I6e18915e am: c2e56739dc

Change-Id: Ie298cd37fdaa8d638298e8326c6f1db7a5d5b7b4
tree: b86178859f2f69098f34ff3516a8b9d7a7dbaaac
  1. core/
  2. services/
  3. tests/