am bb6eb408: merge from froyo-plus-aosp