Merge "Fix misc-macro-parentheses warnings in common_time."