Merge "Revert "Make MmsManager public""