Reconcile with ics-mr1-release

Change-Id: I0ea309b126d5d27d24e26ad3c73dc4cca88eee8c