TOKYO - Iran and Saudi Arabia, which recently decided to restore diplomatic ties in a China-brokered deal, have also agreed on several security issues including Riyadh's conditional support for Tehran's nuclear program and ending the war in Yemen, diplomatic sources said earlier this week.