Reconcile with ics-mr0-release

Change-Id: I0d5ce944499ccd0802d2385e5ade01f613ccefc5