Reconcile with ics-mr1-release

Change-Id: Ibbd535845a392e5749d367ce406e7d5251b6d83f