Merge "Move away from device.get_props."
am: 904e475fbd

Change-Id: I36e9b1611a9efb303927a31d933b1804ca982169