Merge "Change register_stats_pull_atom_callback cookie parameter to non-const"