Reconcile with ics-mr0-release

Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864