Merge "Fix for flaky test in binderLibTest"