Reconcile with ics-mr1-release

Change-Id: Ib960fbb7d51a45d540149e6a21d50c3e1d17dd3b