Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken
* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
cherry-pick d4f3958bde into Froyo
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken
* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
cherry-pick d4f3958bde into Froyo