Merge "Fix binder stub exception"