am cc303b81: merge from froyo-plus-aosp