Merge "Move away from device.get_props." am: 904e475fbd am: 4d8dffffa6 am: 8c19ebd28d
am: c739b9e711

Change-Id: I7cb3c7680f93b2831f29d329934b7118699ea35e