Merge change 25159 into eclair

* changes:
  Fix EAS sending (#2122221)