Reconcile with ics-mr1-release

Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
tree: f59df5d1c5d1ae852877ab3ba76738d6f6fde745
  1. core/
  2. services/