Reconcile with ics-mr1-release

Change-Id: I071634b40bad4ccdf306f8dfc881ea6630bbab7d