Merge "Revert "Fixed the problem that HCI command times out even without pending command.""