Merge "Suppress gnu-zero-variadic-macro-arguments warning."
am: ff01e54285

Change-Id: I5fb652625c50a1719776ba4f174ece3975f87c71