Reconcile with ics-mr1-release

Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c