Reconcile with ics-mr1-release

Change-Id: I327ae7cd98acf06e325bb11dbc58bcc23a5b805b