Reconcile with ics-mr1-release

Change-Id: I623e25d55ed00b150729425f710ca52af2de7913