am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo

Merge commit 'c7d2e169c04de37717c2320184f87caed6be7769' into kraken

* commit 'c7d2e169c04de37717c2320184f87caed6be7769':
  Cherry-picking this fix into Froyo.