Merge "Fix LOG_ID_CRASH build failure."