Merge "Add DEGRADE into HardwareErrorCode"