Reconcile with ics-mr1-release

Change-Id: Ia3e6e7211e43f82053ebbdd87f4bfacf13d2495a