Reconcile with ics-mr0-release

Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9