am 704aa833: (-s ours) DO NOT MERGE cherry-pick "adb reboot" from master:

Merge commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd'

* commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd':
  DO NOT MERGE cherry-pick "adb reboot" from master: