Merge "rebootescrow: use property to find device"