Merge "Update subproject name to remove slash"