Merge "Modify bluetooth test cases GB for new HC APIs"