Reconcile with ics-mr1-release

Change-Id: I55d2ccbd39534a42720313219926751783646379