Reconcile with ics-mr1-release

Change-Id: I4b31e9844745b81486cbd793cf828210ec2c66f6