Merge changes from topic 'adb_cmd_socket'
am: 1f5a49f77a

Change-Id: I81b1e8e7d23f40fd82707f7744c197e25378efb6