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

Change-Id: Ie5629b1d6bf7480d76572eb10f5811d02bb35958