Merge "Explicitly initialize Stats fields" into main