Reconcile with ics-mr1-release

Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
tree: 33c8e234355554fa8318d4a6c9e98baba4285485
  1. core/
  2. services/