am 17e591c5: am df60455b: Merge change 25126 into eclair

Merge commit '17e591c55554fc291fb8bd8a00bfdff0d6e46d11'

* commit '17e591c55554fc291fb8bd8a00bfdff0d6e46d11':
  Update archive to the r802921 from Harmony.