Reconcile with ics-mr0-release

Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301