am fd76f16a: merge from froyo-plus-aosp

Merge commit 'fd76f16a0245d252ea949d245cc6cdff310291c9'

* commit 'fd76f16a0245d252ea949d245cc6cdff310291c9':