Merge "Annotate most remaining HALs with _client/_server"