Merge "Fix NPE in CallStats." into main