Merge "Fix CTS use of bind"