Merge "Revert "Add USSD codes over IMS feature""