Reconcile with ics-mr1-release

Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea