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

Change-Id: Ib6eccafa0ea933d67d5d5679b0f1d37fde4160e7