Reconcile with ics-mr1-release

Change-Id: I86fca75cb9890224a58cb2385514cc3b83373883