Merge "Bump version codes and name to v18"