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

* commit '7b66aaebefb64e75597b33dbfac90072a8e32e9b':
  Move default implementations into Device.