Fix device more so it builds again

Change-Id: I730a77d6871b003b6f07fcf3bb41d46fd17b6a14