Reconcile with ics-mr0-release

Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51