Merge "Prevent Log.wtf crash in benign case" into nyc-dev