Merge "Fix errors in LOG_FATAL_IF arguments."
am: 78755a8c97

Change-Id: I8a75a52970ea8bda0ba2ae71dd82845b0bad7333