Reconcile with ics-mr1-release

Change-Id: I63967a8c63fb1d2f5af167b3a23c848829b01938