Merge changes from topic 'adb_cmd_socket' am: 1f5a49f77a am: db3c28f0d2
am: b71f6edf3a

Change-Id: I6cb20c4b6685e595d004ebe848d041350725286f