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

Change-Id: Ia7e3785d5cf3283b974f048bbbebcf8ff2ed557a