Merge "ion: update API stubs"