Reconcile with ics-mr1-release

Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4