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

Change-Id: I1e9e395d1d35c2c4f0d15416606adfa8a3f07656