Merge "Correctly set oat class status after initializing"