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

Change-Id: I328be35af1e211412b105345b3d1ca78d24b7528