am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."

* commit 'b6339d74fe575aa9e824ebb593c3064555a7af28':
  Fix up a few callers of GetTypeAndDevice.