Merge "Move ion stats reading code under stats"