Reconcile with ics-mr0-release

Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3