The return type of callbacks was changed from int to an enum. (cherry picked from commit d17eabb1) (cherry picked from commit a91ed646)
mentioned in commit 3120ad89