Reconcile with ics-mr1-release

Change-Id: Ibdbd1329aaad7a60ae68c43dacade214fd7e1181