Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf am: d13559092c
am: c5ba3e1014

Change-Id: If4e5a98de613f84d14b74b7307865ec42f217d3d