Merge "Tidy up test annotations and enable presubmit" into main