Merge "Remove trailing slash in osa submodule"