Merge change 25126 into eclair

* changes:
  Update archive to the r802921 from Harmony.