Reconcile with ics-mr1-release

Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
tree: 8b4a0cb569451719596c6f1dab2b7a37c57e5999
  1. core/
  2. services/