Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp
* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
cherry-pick d4f3958bde into Froyo
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp
* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
cherry-pick d4f3958bde into Froyo