Reconcile with ics-mr0-release

Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e