Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken
* commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe':
cherry-picked bf4650ca39 to froyo
Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken
* commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe':
cherry-picked bf4650ca39 to froyo