Merge "Suppress gnu-zero-variadic-macro-arguments warning."