am ce788a4e: merge from froyo-plus-aosp

Merge commit 'ce788a4e4bf0ef89f47577154f2c1799ae2fa40e'

* commit 'ce788a4e4bf0ef89f47577154f2c1799ae2fa40e':