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

Change-Id: Id1b260fb46be86eb789d75902dda3b3c6eee14dd