Merge change I620f67c8

* changes:
  Cherry-picking change I476e5a00 from eclair-china