Merge "Hide RoleManager#getDefaultSmsPackage" into rvc-dev