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

Change-Id: Ieeb3467a6ca7c0f8a5b1c388ca780805bae959cc