am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo

Merge commit 'faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp

* commit 'faa2d970058557fa31d06d168b402d592c368aaf':
  Cherry-pick https://android-git.corp.google.com/g/#change,38305