Reconcile with ics-mr1-release

Change-Id: I0297a6573eef4419224117618fefe72984d68a42