Reconcile with ics-mr1-release

Change-Id: Iaf56a4af45fd6dac0d3697c79ebe29805b5460cb