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

Merge commit 'bd73809e03e038623653bb5fe4bab8eb74f19be1'

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