Reconcile with ics-mr1-release

Change-Id: Idd41de78bf8ea8be5015f576828c4016405ea6d9