Reconcile with ics-mr1-release

Change-Id: I318fcde3c398592182a9e3125c86fbc29e09b162