Merge "Add stable tests back to presubmit" into tm-dev