Reconcile with ics-mr0-release ics-mr1-release

Change-Id: I66915bb61987f551738fb204474d5bd6f0a437fa