Merge "Fix a test related to GATT client that could never succeed"