Merge "Bump apex versions"