Reconcile with ics-mr1-release

Change-Id: I950f3e06350ffce1ccd9f468e8a895972e22b3fa