Reconcile with ics-mr1-release

Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8