Merge "Change the interface for fatal logging."