Merge "Remove device.get_props." am: e79b9969d6 am: 79c240e3d3
am: 29f28f46ae

Change-Id: I038bd5076be4ad0f9754e602c038b78d1f8b1694