Reconcile with ics-mr0-release

Change-Id: I92c175c657ce50726f1767f1d35565b7a5454659