Reconcile with ics-mr1-release

Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329