Merge "Revert "Resolve cross account user ringtone validation."" into udc-dev