Reconcile with ics-mr0-release

Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc