Reconcile with ics-mr1-release

Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8