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