Reconcile with ics-mr0-release

Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288