am af232984: cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e

Merge commit 'af23298447b211a8417e58cda982ea787360e9ff' into froyo-plus-aosp

* commit 'af23298447b211a8417e58cda982ea787360e9ff':
  cherry-pick from master: 42092024ebd81896e741829c50f37a7e0095392e