am cefdedc3: merge from froyo-plus-aosp