Merge "Added SF tests to run during presubmit"