Reconcile with ics-mr0-release

Change-Id: I224ac8e665f91c64935f7a20397b925aba767994