Merge "[adb data server] Initialize variable" into rvc-dev am: 126a1c2dd0

Change-Id: If01b50552b08160da93b4b6b3880133d17b3e2ed