Reconcile with ics-mr1-release

Change-Id: I4e8279a5f59137d2ec2add324d117701ade68a8c