Add constructor with type and address for DeviceDescriptor. am: 7946fbe678
am: feb81b60d8

Change-Id: Ica2b2a456090162b21ea1e32f90aae45814a99e4