Reconcile with ics-mr1-release

Change-Id: I6cf64c289005dccb3d60c972686b7c335aa015a4