Reconcile with ics-mr1-release

Change-Id: I12f17a9da66ac9094aa6f09a83921dd91367cc35