Reconcile with ics-mr1-release

Change-Id: I55bb8fb60cb7af23c0219a32aa18a25031592bbf