am e001074f: Merge "Move default implementations into Device."

* commit 'e001074f227fb74f6ebf5b26c222d09fe69712c0':
  Move default implementations into Device.