reverted master brunch for device_hammerhead