Reconcile with ics-mr1-release

Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9