Merge "Fix NPE in Usage Stats."