am 7980f585: merge from froyo-plus-aosp