[automerger skipped] Merge "[adb data server] Initialize variable" am:...
[automerger skipped] Merge "[adb data server] Initialize variable" am: 4a0a6faa am: cd7ddc48 -s ours
am skip reason: Change-Id Ia8a4d7135c432eb657543c5498fc9dbe8f4718b6 with SHA-1 6a2c18a8 is in history
Change-Id: I67880f96e72a7c4b4f5e814bba934a4dcdcbe848