Merge change 25926

* changes:
  Manual merge of eclair change I26548922 into master.