am 8ce07fab: merge from froyo-plus-aosp