Merge "adbd: tcpip command uses port number from uninitialized memory"