Merge "Revert submodule timeout back to default 10 minutes"