Merge "Add some missing code for SAE support" into tizen