am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo

Merge commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14' into kraken

* commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14':
  cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo