Reconcile with ics-mr1-release

Change-Id: Id8505107b41a8b89c123c16d33f609480a555632