Merge "Add binder test for bug 30445380"