Merge "Give adb a proper progress bar." am: 0e6a23c7d5
am: 91c228f1ef

* commit '91c228f1ef6845535e7e490f0d938cf5e4271f11':
  Give adb a proper progress bar.