Merge "Fix a bug that cause binder calls to be underreported."