Reconcile with ics-mr1-release

Change-Id: Ie5db3f0303bee3b9a75c41a350a03f48895e8fbc