Reconcile with ics-mr0-release

Change-Id: I82d822c97b43372244bb0f676120489f755939a3