Reconcile with ics-mr1-release

Change-Id: I1c7db92995e9c6c8daa833b604acd05f3b28e9c1