Reconcile with ics-mr1-release

Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7