Merge "Rename HZ to HERTZ to avoid macro name collision"