Fix device derps

Change-Id: I2447e5f40af1b305b614aefcce16f2044e13d485