Merge "Add Hammerhead to bliss.devices" into o8.0