Merge "Forgot to bump oat version in previous change"