Merge "Changing the condition since the esim may be removable" into tm-dev