Reconcile with ics-mr1-release

Change-Id: I5f024c557696ab996ad36fcc7b547bea1f594f51