Reconcile with ics-mr0-release

Change-Id: I1c48be157499d190ee24c7fbdc45a1839025761b