Merge "Fix a crash in eng builds"