Reconcile with ics-mr1-release

Change-Id: Icdc464aac126d16b447bfa923fd95a54d775dcbe