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

Change-Id: I7de10f76c56789ae48e72aaf49ce22d19328f76a