Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken
* commit '51b97011b73c10b832ea4ad10637f761802e125d':
cherry-pick 4a4f9886a7 into froyo
Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken
* commit '51b97011b73c10b832ea4ad10637f761802e125d':
cherry-pick 4a4f9886a7 into froyo