Reconcile with ics-mr0-release

Change-Id: Iddfb8ec409ada196db97434c2f85de1c6954cd1a