Merge "Revert "Removing stats service registration in system server""