Reconcile with ics-mr1-release

Change-Id: I9edbfba9b4c69b550b60723b903bae30580a149b