merge from froyo-plus-aosp

Change-Id: I9b0d0e248aff2cc31726f3d3209915b2e26f8bf3