Reconcile with ics-mr1-release

Change-Id: Ic1978fee337ef5c63bdb235c0169505284359b22