Reconcile with ics-mr0-release

Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc