Reconcile with ics-mr1-release

Change-Id: I604e75b878dd2e95f044ff5801f0deecf9e21aad