Merge "Fix undefined error in LOG_FATAL_IF." am: a3ae0dbc0f
am: f468259bd6

Change-Id: I2b90ba9474ba50d133ab00ceab031771d1716f3d