Reconcile with ics-mr0-release

Change-Id: I92ac76c4a7076e39f8d65106a0047eb2f94d2ae9