Merge "Revert "Revert "Update APIs for the flag changes in SAF."""