Reconcile with ics-mr0-release

Change-Id: I32798f1a5d71b996bcf70f957e410f8b8f2c3bee